fix(streamable-http): gracefully shutdown while client connected #494
+52
−15
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
T-core
|
I checked the doc: https://modelcontextprotocol.io/specification/2025-06-18/basic/lifecycle#shutdown It seems that trigger a connection close is enough |
There was a problem hiding this comment.
Pull Request Overview
This PR adds cancellation token support to the StreamableHttpServer to enable graceful shutdown of SSE streams. When a server shutdown is initiated (e.g., via Ctrl+C), the cancellation token ensures that all active SSE connections are properly terminated.
- Added
cancellation_tokenfield toStreamableHttpServerConfig - Updated
sse_stream_responseto accept and use a cancellation token to terminate streams - Modified the example to demonstrate graceful shutdown with cancellation token integration
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| examples/servers/src/counter_streamhttp.rs | Updated imports, instantiated cancellation token, configured it in StreamableHttpServerConfig, and integrated cancellation into graceful shutdown handler |
| crates/rmcp/src/transport/streamable_http_server/tower.rs | Added cancellation_token field to StreamableHttpServerConfig and passed child tokens to all sse_stream_response calls |
| crates/rmcp/src/transport/common/server_side_http.rs | Updated sse_stream_response function to accept cancellation token and use it to terminate SSE streams via take_until |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Close #493
I’m adding a cancellation token to Streamable HTTP to support graceful shutdowns. Because I’m unclear on the MCP protocol’s semantics for initiating termination, I’m currently just cutting off the body stream.
Motivation and Context
In desktop apps, we need a mechanism for the process to proactively terminate (e.g., for updates or user-initiated quits). Today, the MCP Client holds the connection open, which effectively prevents the app from shutting down; most users aren’t aware this is intentional client behavior.
How Has This Been Tested?
Breaking Changes
Types of changes
Checklist
Additional context